bitkeeper revision 1.1159.170.88 (41e40a79WiEU5QHfBOoYWsZfrMacOw)

Re-fix segment fixup code for Linux 2.4.

diff --git a/linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c b/linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c
index 98eb939816c8f1be8d62971ff8162301273802a1..01fe5df9425a326e9a3b672d0aa58bfea344c683 100644 (file)
--- a/linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c
+++ b/linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c
@@ -33,10 +33,17 @@
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/version.h>
 
 #define DP(_f) printk(KERN_ALERT "  " _f "\n")
 
-fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#define __LINKAGE fastcall
+#else
+#define __LINKAGE asmlinkage
+#endif
+
+__LINKAGE void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
 {
     static unsigned long printed = 0;
     int i;